Merge git://git.denx.de/u-boot-usb
authorTom Rini <[email protected]>
Tue, 6 Jun 2017 01:05:51 +0000 (21:05 -0400)
committerTom Rini <[email protected]>
Tue, 6 Jun 2017 01:05:51 +0000 (21:05 -0400)

Trivial merge